fixed error
update component
update logic