demo updated for chitaly2013 submission