modified Demo