Revert "Revert "finishing few registration parts""

This reverts commit 67438dfd6708a61bc52c89929bb2e040e63a1dd0.