*some improvements...