added generic command check