Add in better frame subsetting