updated for A3S v2.0