Add last features to HW2-3