Should we be doing this only on success?