Keith - move import/export changes