Update after last comments to labs