Re-commit of Spring Project