initial commit of 3Q
more changes to schedular