Some improvments
Some improvments