Minor modifications to reduce length.