[*]: some improvements