Re-added input gen