Adding validation.
Merge.