#154 improve schedule