small changes in names and such