Updated fitness functions