Some additions to end time...