Rework previous commit