From master: IMA demo prep.