modified EP code, should be more stable I hope
merge fixed
more merge conflicts