Implemented a new manual match mode.