Timing changes made

All changes invisible to the UI within the main branch