Complete 3-1 and 3-2.

Signed-off-by: acgtyrant <acgtyrant@gmail.com>