Changed to new json style ICM, clean up and a new block!