More Octofying

Change-Id: I3a9a3e2b7a448b58c109b6a2d7b8f531c506ef39