adding changes to validate