Added Validation, FWIW