Major content rewrite