Updated fitness function
merge