Making evali non-threaded
merging