Changes for block 6