x_orig and x_end factors added, now utiilize
refactor
done