commented out validator changes temporarily