Added moved and on_board initialization