Refactored demo to work with new output values