Fix/registration final