added ability to disable validation