newsletter re-factoring v2