Merge "Update the SQL"