Review of the previous commit with several optimization