1.38 Upgrade Spring | Challenge Accepted