small changes from Paul