rearrange the registration and admin stuff