switched to smart_move