@ #718 added new scheduler