Moar thank you updates

Change-Id: Idcb20e35387ed32ad42fc23f4b3508ba5692ce40