more work on scheduler