move code to AladdinAir