Some improvementes