Lots of rewrites but still weird