YJ- Blocks are now pooled
YJ- minor changes