first stab at workstation 10 changes