Genesis loading tweak for downstream
More genesis loading improvement
Fix genesis