Fixing demo;
Fixing public method order;