fixed evapi hard coded stuff