Revert "Revert "Commits N height""

This reverts commit 8de05cb48d66f16b01e59baf84d93085c33d2989.