[Reviewer: Andy] Answer changes