Refactor keep going.