merge with workstation version