Rebase to fix smart.json