Fixed step 2 registration