Some improvments..