improvements of my last change