Updates
Fixed bug for scrum #2