changed to spring 3