Changed analyzer code, does not work anymore