Updated for new schedule