Added new Demo; Reduced compiled code size;