Updated for A9+