Revisiting changes made in the previous commit a bit