Some improvments...