Some more tinkering indeed