Altered annotations slightly.