More progress on scheduling