Incorporated feedback and converted to code-block blocks