more rewrites from cullen