Made Changes After Validation