updated the components and stuff