Added 3.1 partial solution