Need Retest

Remove Xicon, modify get function