Working on scheduling issues