updated for timing
unfucked something