notesting rewrite