Added Tianyuan's static analysis agian because I forgot to pull it on the computer I was working on the last time