Added ordered choice and a muffler.