more bundle shenanigans