update with latest changes that happened for demo