Improve register step2