Added 2.0 with new gen stuff