updated validation, #31