make changes requested in demo