Merge, removed few index calcs