added bensbranch changes by hand