Updated the index to be more dynamic, less work for me