done rebasing
updated text for components