#8 Simplify indices
build