rework router actions