(MSVC 360) Solution updated