Only updating the status when needed