shape now block intermediate commit