Revert "Ny Plan"

This reverts commit 4088285ded78ae9e4af42a740f621832bdc238e5.
Revert "Revert "Ny Plan""

This reverts commit 8b0e67f8b36bd6b9da335d82ea9cb6c154ad4012.