Rework extra blocks