Updates to NY model, includes airplane