working on some changes.