Sprint 3 - features changes