commiting last changes before i leave friday

bjG