improve splasher and audit logic