Update code new style