refactor to DRY code
remove save logic to paste it in model
add new feedback options
add new feedback info
solve merging conflict