HC4: modified a couple of demos