updated to even more final version... *sigh* :-)