Upgraded Spring Version. And added more expansive editing.