Did some work on the spring configuration