cleaning up and adding in ai interpolation