In the process of upgrading the niceness of demo projects