Cs/upgrade global variables