Added cond edge support