missing a couple of things from last edit