Updated to work with AS Beta