Final changes for registration