refactoring in registration over survey