Loaded in splines and merged all previous changes