working thru douws last changes