improved design for demo.