Combined two bundles; Added location shift function