make changes more clear and comment them