initial version
adding changes made ages ago...