Improved end timing