theere were some changes i am going to do