adding components, will be remove later