shouldn't this stuff be in an `after_success` block?