Updated scheduling