tweak annotation code