updated (added scheduler stuff)