changes suggested by Charles and Scott