applying changes from AS SDK - unfinished