Can we do this on `complete` rather than just on success?