implemented server capable edit code tweak