Improve scheduling