added audit trail
fix merge