modified evac.cpp -- working on all tests!