changing things... need to redo a lot of stuff but works