Further progress handling certification and demonstration flow and
display.