better end of year index handling