even more tinkering