made changes requested by Robin