updated new fallback structure