Updated for AS 0.4.4