working on some changes