some hard-reading updating for #102