Added complete, fixed branching in EX