Add Mark's suggestions