Added registration
Merged code