More work on the registration process