Rehaul of BlockHandler