Re-design index a bit
merge