* add missing components from its wholes from @小娟