make some changes to solve exercises