removed crap
changed stuff