H1B visa extension from non-profit to profit

[swa24]

Hello,

I have a not for profit H1B which will expire in 2020 and don't have an approved I140. If I move to a for profit job and file get a new H1B for the new for profit organization, will my extension still expire in 2020 or would I get a new six year extension while moving from non-profit to profit organization.

Any help is highly appreciated.