Changed time calculation