better restart and display
merge