moved E/R, tweaked estimation function