moved things around npnp