Revert "Revert 7ac213f..f7c53b3"

This reverts commit 82f00bd0e682a5181fa7c6f1b295f5292bb05a3f.
adds validation