Updated Several Components