made sure commented all changes