renamed a few vars