work with the latest; add annotation limit test