* finish task #371,372.