merge in latest from Marty