06_24_10_merged