major commit 18 may 2014 includes ACL logic