Another rewrite
Comments are new
New commit