Address jgriffin's review