updated server bundling