Revert "Revert "nn""

This reverts commit afb812446b0eb6b9a9d7dcee7b8fa9935e5a3a9a.