minor rewrite
oops