image refactoring
opt sync