Code structure update
ttt