acl
merged with changes from Niek