changed some vars