changed some varable names, fiddled with some values