added changes, changed some code you know whatevs -- these are shitty, I know