prtial edit
merged