Made changes to make demo work locally