Added new stuffs, good times