Attempt #2 of handling the code blocks