Sprint #6 + feedback from Sprint #5 implemetation