New Code for Gen2 App