Revert "Revert "heightmap changes""

This reverts commit 4c5f18cc5f3f2add739800b66bee7e6a1f325739.