Re-generating with hardcode out/ removed