some work and a name change