Registration

registration completed, merge latest changes