More spot replacement of blocks...