Validation has been added and tested