Changes recommended by Kevin