All now is adjusted but it need of a test