Changed a variable from static, and some other stuff