improved static analysis