Issue #18: simplifed replacing input things