Changed evaluation criteria order