Chnages to validation
Conflict resolved