Communion Fix/Rewrite