Fixed z-sorting again, in the process of upgrading adjacent