updated figure indexing