commit to pull
fixed merged conflicts
added interpolating function