Rewrote ACL

Change-Id: I9286e29ca6f6c1ef69c4295be333ba9b8d4bd263