Some improvments