Adding better c editing
Better compatibility