Add comment from Alisdair and respond & improve P/R