Demo version with latest corrections