changed a lot of stuff
doing this as a backup