Minor changes + static index