Revert "Revert "working on registration issues""

This reverts commit 7014ada6b8c8ed2d243621e16b324eb1c3a4f2b7.