started to redesign the variable names, adding some path safety