Changed some time conventions and finish NextStoptime