T&P please - update in comments