using macros for scheduler names
updated schedulers