Improvement on demo