added parts list
fixed merge conflicts