More changes. No admin privs check