8.0 add fields missing to prepare extra move