Updated to use bundle for split expander instead of inline function