slightly improved previous commit