Updated evaluation funtions