added energy and velocity properties to model