Paper #5 changes and Orest suggestions