C16_Sajha and datamap -- I am in the same situation right now. I started working in TPS EAD once my OPT-ext EAD got expired in 2015. My H1B application got approved this year. DO you know if anybody has completed change of status from tps to H1b without going out of US ?