11_23_10_merged