Modify per jeditutil refactoring