Updated router and trying promise.all