Updated to reflect changes from simplification.