Update to use subsetting

Prior to this commit we were not using seubsettings