Centralized timing.
Added swimming