updates to baseline demo code