More Octofying

Change-Id: Iadfa2866e65885a89a77606a22f82ea23b33832a