New improvements for Demo