Big update (thx dude for your details ...)