Gen 1 and 2 Revised