Condition reshaping, plotting by condition axes
Merging TDCA changes