Updated analysis, various issues still exist