removed offset for index
Merge branch 'localtest'