Tentative fix for false posivites issue.
New modifs to state system.