actually re-added validation