Q : fix status and variable shadowing