change some var names jah feel