+ added administrator support