after demo code updates