Fix for 144 - refactor blocks