towards a working version... again...