name change, incorporated new filees from David