[Update] Adding direction by using var
Merge branch 'master' into update-restructure

[update] merge with master branch