Another rewrite <3