added auth admin
merging...