switching to block_class 2.0