Added links
added validations