Some attempts to fix blinking annotations
Removed test code.