Random updates.
Fixed merge.