Reworked the validation mechanism completely(!).