Modified point matching stuff