added registration & activation