update #68
reFix #68
(cherry picked from commit 64b43f4)
refactoring moveUp/Down
(cherry picked from commit 7abd45f)
again reFix #68
(cherry picked from commit fbad402)
update #68