Changes needed for Shreditor