started to implement index
merged