implement changes requested by Tom