big changes to the registration and views