[#4] All cases use same action and small improvements.