annotation redesign is almost done, #608