#154 improve schedule, i hope now the impl is correct :)