upd (moving option) part 2

Signed-off-by: Konctantin <gawrilyako@gmail.com>