some changes in solution