a few rewrites