edited after read-thru