Updated based on spring modelling changes