Width corresponding code modifications