code before section 8.1.8