more finetuning of new block organization