Added file buffering and subset word adding