Rework next to upgrading npm deps