Update solution #2