Tinkering optimizations