modify for AS