Added kinetic energy and fixed class name