commented out some thingsfrom ng version.