#19: architecture change, Scheduler added