added fond and other changes from rob