Adding functionality to create the next gen