resume work trying to unify these a little (nw)