Address initial review from Reynold