re-added the unified input - fixes