One more change to the component
updated logic again