Updated for work station