S6_v6.1 Adding Admin Features