validations added
fixed merge confilcts