Moving towards adding the automatic addition of longest match