merge Paul's changes with Weston's