Add index back working