Continuing work on gen2