Kinda reverted back to the old timing (for now)