Updated for Spring