Structure correction, add answer 22