Changes in Validation Code