Time calculating FINAL fixed