REFACTOR/use-state-manger