Phil's changes are being commited.