Improved previous commit