A2 Automation improvement

A2 Automation improvement