Make the least change to favor friendlycode less change