Feedback

This is fix attemp #1