added more streamlined Fix for index adding