Removed the generic stuff, added some of my own