Changed index
Addded bypass files and better index error handling