update eval removing most bishop test and rescaling