edit the 1st part
add the 2nd part