Modified some access control (strange how I couldn't get this working before...)