Workbench Demo Changes