Enhancing demo project