Add changes suggested during demo