Got rid of unnecessary bits and add CleverScruff