updated components for the new changes in g-component