This is an update on master but on demo_app version

Will switch over to Carlos4 branch