Added some stuff... deleted some stuff... lol