small optimizations for another workstation