solved some changes