new version of Solution