add activate and register
merge conflict with server