Otimized a bit more..