revised some more...