updated format, and added primary key to index