bit more fiddling