update tested, tweaked and now working.