[MODIFY] some changes in Expander