Modified in the light of demos program