adding changes to Validation