removed hard-coded index .........