Added component, till page 200