Cross gen improvements