@kanchadai, I used the expiration date of the 2nd H1 approval I94. My class of admission was H1B but D/S had expired. It's better to consult with the attorney on these questions.