More trigger work, outputs rewrite