Updated schedule according to Seleis suggestions