revert back to using references to code blocks