Incorporate stuff from workstation