Edited and gutted I7
Editing/augmenting I8