updating demo and addressing #6