Revert "Revert "store nag""

This reverts commit ce0deef437706685046255fddb5eb00473e04605.