Continued work on scheduling functions