[Improvement for the 1st milestone]