fix direction
refactor
new version move to