4/24 fixed redeclared variable error