Changes for AS7