upgrades to spring 4