merge Paul's update