Improve project Essential_L16.1