upgraded to Haxe3