do refactor
do refactor controller
test
test