not closed
commit before test
refactor all
faster