changes to avoid local optima
merge conflicts