Sprint #5 implementation stage

Implement feedbacks