returned the old functionality for fallback