more rewrites. soon...