editData continued

integrated editData into system