still some issues after new scheduler code committed