pulling sam's change
fixed merge confls
fixed further confls