Made corresponding edits as well.