doing some changes: