Time calculation added