Modified .i file so it can be analysised now