Wip overall rework
Upgrade bundle wip