Major update to router