refactored and fixed Fata beautifull work
fix merge from I do not know :S