Changes related to previous commit