Add block part 2 (enhanced all block funcs)