After giving it some thought after my debate with JJB on the Ascendant thread… I propose that the ship we see in Rey’s Force vision in TFA (yes, TFA) should be changed so it wouldn’t be Ochi’s ship, also remove Rey’s familiarity with Ochi’s ship.
EDIT: Nevermind, I think we can still continue it in Hal’s thread…?