Update deps, move to tape, replace Q