adapt comments and add hardcoded demo2