updated to use spring 4