Finished updating the components