with edit version function fixed