resolving merge conflict
updating support folder
updating support folder
Changing the way to observe scheduler speed