Adds changes recommended by Robert G