update for demo-option complete
complete merge