AT: committing changes to the TaxEditor Post third round of code review