improvments #7