renamed some veriables