Almost finished with STG upgrade