Possibly fixed TOM calculation