added some ifdef expcone
matched the order of stopping criteria to the new branch
Chose the better potential of the two
Still experimenting