rewrite
cleanup
add link