Changed annotations. Need to confirm with Jun if this is ok.