Pavan's edits;