renamed vars to avoid hash merging issues