Added more to after_failure