The mess whit refacturating fixed!