The current template matching problem is that, due to changed normalisation, the flat graphs match a lot better as there is less deviation.