added routing and category selection