Upgrade solution, fix indentation