some adjustments to get the bundle working