Final revision of G engine ... committing for iPad testing