minor changes:  we don't care what the admin is named, and don't use thisFormat, but this_format