Trying to improve freehand drawer perf