Spring update (7/17)

Spring update