fixed calculations
changed calculations and added time again