changed some var names