Swc-1911: update after review with Brian/Lara