WIP decisionMaking plus merge with scheduler changes