Updated to fit revision requests