Added some pre and post classification heuristics.