updated fallback code