code restruct adjust.
force ignore ecb upgrade warning.