merge 10/11, ready for presenation