Change some logic with status handling