Updated to the latest block reordering/additions