more hacking to get it working, with success :)