add report parsing
add huge architecture fix
add fix