Incorporating Michi changes - thanks ... :-)