Converted blocks to enum type, still not broken.