even more tinkering...