2318. Section 2318 Q now finally at ease!