Code Blocks Fixed