Complete q3.18