H1B to F1 to H1B transfer currently on OPT

Hi All,

I was working for top tier indian company on H1B visa for around 1.2 years.

Then I shifted to do MS and got F1 Visa. Currently I am working on OPT.

Following is my question:

1. Will I come under new H1 or old H1? If new than I am in a bad position as H1s are already done in June for FY2012

If old H1 than how many years still remain? 6-1.2 yrs?

Could anybody please clarify?