Clean up
add the demo