Updates to router and client