Before adding 2010 Gen1 explicits