More tinkering yet ...