Rewrite attempt 6