#154 improve scheduling