Aaand a little bit more fiddling