Working on the registration