simplify and use correct acl