RF: included proposals for changes