More tinkering from work