Upgrading Gen 2 to 3

Let me have the engineering team take a look.

:cheers: