Some more fiddling