glavin re-write