Instrument calls. Gotta reorder and fix targets.