fixing routing & updating bundle