improvments #6