Sync for Demo changes