Rewrote EditFunctionsImpl