changed the logic to use workspaces