revert until naming var locked bug if fixed