Done except for router params