Modified the file after the demo feedback(marked deprecated calls)