some changes made so far