All done and working

Thank you rbarbour

Hope this is usefull for more users