Reworked Schedule, fixed freezing issues