Agree. Separate modem and wifi units. Does your home have plaster walls? On many older homes, plaster is often spread over a metal mesh/screen backing affixed between joists. This metal blocks wifi and creates "dead zones" between rooms. If not that, get wifi repeaters.