first release with re-worked routing