Updating to use router