changed name and added validations