Updated for Scrum 2