--Fix feedbacks and add income