Last changes for full working workbench on pc