Updating validations
Merge branch 'potali-1' of https://github.com/mdk199/rorproject into potali-1