Spring code
Added Adam Bien