Made Changes, added bunch of stuff