removed GA + fixed more paths