Revised Match + javadocs