still not working, some more fiddling