Updated for testing the new scheduler.