Ugh .. sorry - the last change I made on this looks bad - please wait with reviewing this while I mend it