Daniel adds comment and suggests improved P/R