consolidate aikido and sort actions