further changes to subsetting