Final version of hwq1 and hwq2