Feedback

This is fix attemp #2