final pass at demo