Updated to validation 1.1