Improvement of code layout SIG_V2