Added more functionality to mating