removed auditing, tidyied up for sharing