Merging Coffee-Rewrite 

yep