Changed for version 1.3 demo