updated stuff for AS 0.61