add console
refactor
refactor