Added dev-sprint-7