Changed scripts to improve index time
Merged files