Simplify Discrete/Continuous input mode
Merge