Moved to Shreader Class