Improve the Embodiment Combo system