Updated to reflect changes by other members