Added some stuff
Made some changes