Reverted last changes and added 'Feedback'