some improvements in the details 2