Changed lots of stuff 'cause of Tim