Re-add some pieces of code for demonstration