Rewrite attempt 7