Enhanced previous commit