Updated some of the components