General Changes on block 2