#3 update some more component.