Changes made from workbench2