changed to Paul's version - second time