i added a bunch of stuff...