Added bunches of stuffs