Preliminar feedback view
Fixing merge conflicts