changed evaluation function