pre merge from brian
merge