Changed comments
Changed comments
Resolved merge
Changed aimation timer