Add check for in progress scheduler. Clearer variable naming