updated for A7