New updates with a major refactoring of the ground fitting