Admin protection. New gems
merging