added the workspace logic